Support switching back to non-gridded mode. (#135169)

Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
	switching back to non-gridded mode.  (#135169)

Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".

diff --git a/ChangeLog b/ChangeLog
index 844537bb8ad7a3adc766cddfcda70c6cc23bfe6a..a68c89a90a8094c392a7487a5cb1699b2a1a22c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
+       switching back to non-gridded mode.  (#135169)
+
+Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".
+
 Fri Feb 27 18:52:19 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_style_set):
@@ -35,6 +44,7 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
+>>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 844537bb8ad7a3adc766cddfcda70c6cc23bfe6a..a68c89a90a8094c392a7487a5cb1699b2a1a22c2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
+       switching back to non-gridded mode.  (#135169)
+
+Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".
+
 Fri Feb 27 18:52:19 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_style_set):
@@ -35,6 +44,7 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
+>>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 844537bb8ad7a3adc766cddfcda70c6cc23bfe6a..a68c89a90a8094c392a7487a5cb1699b2a1a22c2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
+       switching back to non-gridded mode.  (#135169)
+
+Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".
+
 Fri Feb 27 18:52:19 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_style_set):
@@ -35,6 +44,7 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
+>>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 844537bb8ad7a3adc766cddfcda70c6cc23bfe6a..a68c89a90a8094c392a7487a5cb1699b2a1a22c2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
+       switching back to non-gridded mode.  (#135169)
+
+Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".
+
 Fri Feb 27 18:52:19 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_style_set):
@@ -35,6 +44,7 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
+>>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 844537bb8ad7a3adc766cddfcda70c6cc23bfe6a..a68c89a90a8094c392a7487a5cb1699b2a1a22c2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sat Feb 28 01:39:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Support
+       switching back to non-gridded mode.  (#135169)
+
+Fri Feb 27 22:29:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_can_activate_accel): Add "Since: 2.4".
+
 Fri Feb 27 18:52:19 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_style_set):
@@ -35,6 +44,7 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
+>>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 9c67cac92c3daacc28282ca1ac3b0a20897e7100..3e5ce159422a239aeb2692cce7ed01365e319935 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2579,13 +2579,14 @@ gtk_combo_box_set_wrap_width (GtkComboBox *combo_box,
                               gint         width)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (width > 0);
+  g_return_if_fail (width >= 0);
 
   if (width != combo_box->priv->wrap_width)
     {
       combo_box->priv->wrap_width = width;
       
       gtk_combo_box_relayout (combo_box);
+      gtk_combo_box_style_set (combo_box, NULL, NULL);
       
       g_object_notify (G_OBJECT (combo_box), "wrap_width");
     }
@@ -2744,7 +2745,7 @@ gtk_combo_box_set_active (GtkComboBox *combo_box,
  * @combo_box: A #GtkComboBox
  * @iter: The uninitialized #GtkTreeIter.
  * 
- * Set @iter to point to the current active item, if it exists.
+ * Sets @iter to point to the current active item, if it exists.
  * 
  * Return value: %TRUE, if @iter was set
  *

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8d3622ffe9e3e5e7231d64402801bfa169d667f5..80be7ebff4f16977272f9671f865e18337b7f3c0 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2942,12 +2942,14 @@ gtk_widget_real_can_activate_accel (GtkWidget *widget,
  * Determines whether an accelerator that activates the signal
  * identified by @signal_id can currently be activated.
  * This is done by emitting the GtkWidget::can-activate-accel
- * signal on @widget; if the signal isn't overriden by a
+ * signal on @widget; if the signal isn't overridden by a
  * handler or in a derived widget, then the default check is
  * that the widget must be sensitive, and the widget and all
- * its parents mapped.
+ * its ancestors mapped.
  *
  * Return value: %TRUE if the accelerator can be activated.
+ *
+ * Since: 2.4
  **/
 gboolean
 gtk_widget_can_activate_accel (GtkWidget *widget,